more naming switches for consistency