Naming, copyright updates