Changed some labels in project menu Removed some definitions that were commented out.

Change-Id: I5a6103cfccfec3c79c5f533e399085e2f2bc1e06