remove contract name from FK ids, also camelCase address fields