Updated project names and updated code gen.