Fix thingie

Rename to get defines in proper place and fix for megaphone capitalizatino