CodingStandards & namespaces bugfix