Fix two other naming conflicts