Fixed side effects of Class.name manipulation