Fix for uppercase/lowercase with layer names