Change the props in the header
Clean up terminology. Fixes #3