refactored layer names