Corrected Raspberry Pi port
Better define naming scheme