Added Shadowvim_ prefixes