Minor. fixed abbreviations in class names