switched Name & added UniformManager

UM is empty & Defs -> DefinitionAndInclude