use new renaming convention