Replaced temp names with sci-fi names