Updated Naming
Updated copyright and links