Merge "Fix case of imports"