Fixed naming issues for Paid for User plus small corrections