Minor renaming and fix readme