more function name changes to comply with unix