Update PG version to 2.7.0 and clean-up naming scheme.
Some clean-up and progress.