Further refactoring based on review feedback.  The PAGS xml tags and java classes renamed.