Updated project file includes

Also fixed nameable interface