Rename functions for sane naming