changed internal header names