Rename fields and remove unused