Some copyright and naming changes