[refac] Updated the main file to use the new layer names