naming consistency
fix logout bug