Un-prefixing FBO fields and moving them into ext