Name refactoring ; clean up imports