More ABM, Shapes, Util renaming