Name consistency on catalog (no plural)
make sample app scheme shared