Cleanup naming (flyweight -> result)