CAY-1946

* removing references to SmartNameGenerator