Changed names around system to fit new project