Renaming - removed Jsm prefix of classes