Rename some attributes and consts