Fixed naming to improve consistency.