fixed naming, licensing and copyright