#40 @andreweskeclarke @rdsubhas Fix hardcoded names in headers