Renamed definition classes to not clash with namespaces