Rename with_bikes_join/include to joins/includes for naming consistency