Move serial path into define, fix name bug