rename from makara2 to makara (came from a separate repo)