Converted prefix support variables to match the new style