updating copyright years and cleaning up naming comments