Moved button and diffuse to root cause of naming conflict