small changes and renames