cleanup to ensure that all interfaces in java package are Java.