Updates to support Win64

Mostly tweaking cmake files to ensure consistent naming.