Naming consistency and README correction