Switched to dhp naming convention

extra cleanup also