Rename public functions, add header