Updated non-cached code
Updated naming conventions in cached terms