some light file renaming and removal of scope apply