fix gemstore/store naming issues