Fix some naming styles for consistency