[fix] consistent naming and fix prettier return