rename to hpp
rename to hpp and minor constness