diff --git a/README.md b/README.md
index 7d021d2..5664ee0 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ If you are not a programmer but would like to contribute, check out the [Awesome
- [Roc Toolkit](https://github.com/roc-streaming/roc-toolkit/labels/help%20wanted) _(label: help wanted)_
A toolkit for real-time audio streaming over the network.
- [tensorflow](https://github.com/tensorflow/tensorflow/labels/stat%3Acontributions%20welcome) _(label: stat:contributions welcome)_
Computation using data flow graphs for scalable machine learning
- [Yugabyte DB](https://github.com/yugabyte/yugabyte-db/labels/good%20first%20issue) _(label: good first issue)_
Distributed SQL database.
-- [MoveIt](https://github.com/ros-planning/moveit/labels/first-timer-only) _(label: first-timer-only)_
Easy-to-use open source robotics manipulation platform for developing commercial applications, prototyping designs, and benchmarking algorithms.
+- [MoveIt](https://github.com/ros-planning/moveit/labels/good%20first%20issue) _(label: good first issue)_
Easy-to-use open source robotics manipulation platform for developing commercial applications, prototyping designs, and benchmarking algorithms.
## Clojure
@@ -108,7 +108,7 @@ If you are not a programmer but would like to contribute, check out the [Awesome
## Java
- [Strongbox](https://github.com/strongbox/strongbox/labels/good%20first%20issue) _(label: good first issue)_
Strongbox is an artifact repository manager written in Java.
-- [TEAMMATES](https://github.com/TEAMMATES/teammates/labels/d.FirstTimers) _(label: d.FirstTimers)_
TEAMMATES is a free online tool for managing peer evaluations and other feedback paths of your students.
+- [TEAMMATES](https://github.com/TEAMMATES/teammates/labels/good%20first%20issue) _(label: good first issue)_
TEAMMATES is a free online tool for managing peer evaluations and other feedback paths of your students.
- [elasticsearch](https://github.com/elastic/elasticsearch/labels/good%20first%20issue) _(label: good first issue)_
Open Source, Distributed, RESTful Search Engine.
- [JabRef](https://github.com/JabRef/jabref/labels/good%20first%20issue) _(label: good first issue)_
Desktop application for managing literature references using modern Java features including JavaFX. [Dedicated to code quality and constructive feedback](https://devdocs.jabref.org/getting-into-the-code/development-strategy): Each Pull Request is reviewed by two developers to provide high-quality feedback and to ensure high quality of new contributions.
- [Wikimedia Commons Android App](https://github.com/commons-app/apps-android-commons/labels/good%20first%20issue) _(label: good first issue)_
Allows users to upload pictures from their Android phone/tablet to Wikimedia Commons.