Added license
Minor renamings