edited some function names to comply with naming conventions