Changed namespace to not conflict with type name