Updated project & classes names