rename all of the internal imports to use the new header name