Committed some renames