Renames and tests etc.