housekeeping, some function name changes