Fixing naming consistency.
Logic to switch between modes. Missing few mode.