Fixed PIN-PORT name convention