Refactor: Removing old name placeholders, that where added for the refactoring