Fix temporary naming and image urs substitution bugs