I am not sure if we have to keep this preg_replace at this layer, which should be generic. What is this for? Was it only needed when generating object names?