Rename constants. Closes [fc2fc68]