Licensing and ownership fixes
Doesn't work
Ownership changes
Rename due to typo