Consistent naming and README update