Starting to get rid of function extension suffixes