Remove excessive prefixed, add Value:forKey: