Make sure all manifest elements are referred to by their full name