Common fix for FINAL_SUPERTYPE and FINAL_UPPER_BOUND errors

I did some renames and in case of small test files git marked them as deleted/added rather than renamed.