Naming, proper header stuff; tag 0.9.13.1