Rename private methods and constants for consistency