Fixed schema issue with Class.NameKey.