Tiles now Have Tile at the end of the name
Merge branch 'FinksNoMoreEnums'