Refactored names in cshare.controller.Controller