Updated project to recent renames