d3: Changed Scale names for consistency