Fixed naming and license