Fix static prefix and entity reference