make function and constant naming clearer (code review feedback)