fix issues w/ scoping on entities, ensure unique entity names, rename webapp -> webapplication, small fixes