update for enum-spacing; rename tiles without suffix