still renaming constants