Make layer naming consistent