Rename constants and some private methods