Added simple support for renaming classes that are not fully qualified