correct suffix name and highlight bug