Ok, I can't really take any credit for this as i just renamed one file but i think it looks great :)
N.B. Still works with custom ak models and there are no consistency errors.