small naming and header changes