Port change and fixed function rename