Changes mostly having to do with naming conventions