Update to meet naming conventions, proper license