Better usage string
renamed classes