Renames and new repository methods