phase 2: renamed .h files to match coding standard