Renames as per conventions
Updated more naming