#79 - change names of SCR classes