Rename BuildConfig and Types headers
Eliminate redundant state changes