Updated copyrights, made file names consistent