Created canonical class and file names for shapes