Updated naming
Updated project