Renamed a couple methods.
Include generated header file within generated source file.