New naming convention applied to many functions, see #118 for details