Remove hardcoded moment name