Added support for more flexible page naming

Retains current naming scheme but adds support for a more flexible structure.