Renames and fixes