- renamed some field machine names and package name