Task #68 - Clear up backend naming.