I did for the namespaces and files.  In this context, PAG is more appropriate than PAGS in that the next word is Store.  I can change it to PAGS and remove the word store if that will be better.