A number of different refactorings going on:

namespace Spire -> namespace spire
CPM_NAMESPACE -> namespace CPM_SPIRE_NS