Rename to support brick file structure