Normalize names of internals
Finalize change of headers

Add dependency to Makefile