[CR] template loader enhancements + Page => page