renamed some stupidly named functions