Updated naming and license headers