Fix for naming pattern issues.