Address naming and documentation remarks