Fixed: Renames and removals