Renamings; TODO unify *-name and *-data keyword creation