Copyright notice, and some variable renames