Modified location and logics of layer naming conventions