moar naming issues (｡◕‿‿◕｡)