Make Builder naming consistent.