Fix Circuit tile layer and rename