Finally fixed imageId names