Update FotoMagico for new naming conventions
Merge pull request #1575 from Cottser/fotomagico

Update FotoMagico for new naming conventions