Better naming. WIP on apache failing (dup declaration?)