more function name changes to get page generating something without
errors

now to fix queries!
back to previous state