Fix naming
Fix to use Picture type
Refactoring
Rename