Rename to proper name